Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 27 Aug 2010 07:07:20 +0000 (07:07 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 27 Aug 2010 07:07:20 +0000 (07:07 +0000)

Trivial merge